Skip to content

REL: 1.4.0 #3116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Dec 20, 2019
Merged

REL: 1.4.0 #3116

merged 9 commits into from
Dec 20, 2019

Conversation

effigies
Copy link
Member

@effigies effigies commented Dec 19, 2019

Summary

Prep for 1.4.0, for immediate release, pending completion.

Open question: Should we move from git-line-summary to git shortlog for determining .zenodo ordering? With #3096, the line summary became:

$ head -n 13 line-contributors.txt

 project  : nipype
 lines    :   298318
 authors  :
 109691 Oscar Esteban                       36.8%
 67391 Christopher J. Markiewicz            22.6%
 53863 Satrajit Ghosh                       18.1%
 10441 Krzysztof J. Gorgolewski             3.5%
 3841 Christopher Burns                     1.3%
 3836 Hans Johnson                          1.3%
 3828 Erik Ziegler                          1.3%
 3650 Alexandre M. Savio                    1.2%
 3458 Dorota Jarecka                        1.2%

Shortlog:

$ git shortlog -ns | head   
  3308	Satrajit Ghosh
  1968	Krzysztof J. Gorgolewski
  1810	Oscar Esteban
  1063	Christopher J. Markiewicz
   464	Christopher Burns
   383	Mathias Goncalves
   248	Dorota Jarecka
   247	Erik Ziegler
   235	Shoshana Berleant
   202	David Ellis

Release checklist

Uncredited authors

The following authors have contributed, but not added themselves to the .zenodo.json file. If you would like to be an author on Zenodo releases, please add yourself or comment with your preferred publication name, affiliation and ORCID. If you would like to stop being spammed whenever I'm the one doing releases, let me know, and I'll add you to a blacklist.

No entry to sort: Gio Piantoni (@gpiantoni)
No entry to sort: Isaiah Norton (@ihnorton)
No entry to sort: Niklas Förster (@niklasfoe)
No entry to sort: Kirstie Whitaker (@KirstieJane)
No entry to sort: hstojic (@hstojic)
No entry to sort: Jonathan R. Williford (@williford)
No entry to sort: Abel González (@abelalez)
No entry to sort: Victor Férat (@vferat)
No entry to sort: Kevin Sitek (@sitek)

Acknowledgment

  • (Mandatory) I acknowledge that this contribution will be available under the Apache 2 license.

@codecov
Copy link

codecov bot commented Dec 19, 2019

Codecov Report

Merging #3116 into master will decrease coverage by 0.05%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3116      +/-   ##
==========================================
- Coverage   67.84%   67.78%   -0.06%     
==========================================
  Files         295      295              
  Lines       39304    39302       -2     
  Branches     5178     5178              
==========================================
- Hits        26664    26641      -23     
- Misses      11934    11952      +18     
- Partials      706      709       +3
Flag Coverage Δ
#smoketests 51.2% <100%> (-0.04%) ⬇️
#unittests 64.99% <100%> (-0.08%) ⬇️
Impacted Files Coverage Δ
nipype/info.py 89.23% <100%> (-4.8%) ⬇️
nipype/interfaces/dcm2nii.py 58.68% <0%> (-6.11%) ⬇️
nipype/pipeline/plugins/legacymultiproc.py 59.29% <0%> (-3.52%) ⬇️
nipype/__init__.py 58.06% <0%> (+3.22%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 03e30cc...1a86904. Read the comment docs.

@effigies
Copy link
Member Author

I personally vote for moving to commit ordering instead of line ordering. Mass refactors and style updates have distorted line ordering.

Any objections?

@satra
Copy link
Member

satra commented Dec 20, 2019

no system is perfect - i'm fine with whichever order.

perhaps something to consider in the future is to emphasize more recent contributors (for example between minor releases 1.3.x- 1.2.last), and everyone in major releases.

@oesteban
Copy link
Contributor

No system is perfect, either way is fine by me.

@effigies
Copy link
Member Author

Spent a few minutes trying to switch to commit counts, but it's dropping some entries, and I don't have the time to debug right now. So we'll leave at line counts for this release. When I fix up the script, I can submit a proper PR.

This all good? I made a couple changes in info.py that I think were missed by the Python 2 PR, but if someone wants to double-check, I'd appreciate it.

@satra
Copy link
Member

satra commented Dec 20, 2019

looks good.

@effigies
Copy link
Member Author

Also dropping funcsigs.

Will merge and release on pass.

@effigies effigies merged commit 4c3279c into master Dec 20, 2019
@effigies effigies deleted the rel/1.4.0 branch December 20, 2019 17:58
@effigies effigies added this to the 1.4.0 milestone Jan 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants